merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 22 Sep 2010 06:46:51 +0000 (15:46 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 22 Sep 2010 06:46:51 +0000 (15:46 +0900)
commitdda4a814a09f1950464a4ee422e56370ebc764d1
tree37e0b0946544c99f3a2291a0e4cd7cad3afdee34
parente90a13daf7d9a5bce05ae3fbb032e24875338990
parent85937ea2be2f6b2fcf034fb338f8fe413a6447ab
merge trunk